merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 27 Aug 2010 14:06:02 +0000 (23:06 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 27 Aug 2010 14:06:02 +0000 (23:06 +0900)

Trivial merge